Resolve constraint issues
Text
 