close #20 - Fixing bug from version 4.1. Not created another issue