Fix for issue 11