fix for issue + unit test