#79 fixed (again)