Propably fixed #184 issue, @lnxmen, you have to check