Fixed one of the issues