Fixed issues!