fixed constrain handling