#334 fixed