Merge pull request #440 from y-higuchi/fix_comparison_between_different_class

Bug fix detected bug findbugs comparing 2 different classes