#266 fixed ! thx to tropicdome