Fixed the issues with the last push