Fixing issue #291 (WIP)

Rmove this entire if statement