Fixing issue #291 (WIP)

remove this if block