Better constraints for #09