Fix for covertiy