using equals instead of ==
bug-fixes