issue 508 fixed