Fix for issue 3