#292 fixed