bug fix for issue 5