[#67781684] added more constraints