another constraint related bugfix