Fixed issues again