Bugfix: use String.equals instead of ==