Fixing issues again