Fix issue with security constraints