Fix for issue 2