fix for issue 1