Fix for issue 15