Fix after making the API stricter
Fix for one of the bugs in #147 , needs testing from user which reported bug.