#248 fixed