Fix issue with broken validations

https://sprint.ly/product/16525/#!/item/16/