fixed issue 1612, thanks gi0baro