Fixed bug with ==. (Changed to .equals())