Removed judgment ala issue #52