Fix for issue 22