issue #40 - remove this misplaced (and redundant check)