And finaly fixed #26