Fixed issues with angry