Fixed issues with numbers