Propably fixed #216 issue