This fixes #392 for the stable branch. !543 takes care of removing the constraint in the development branch
