Fix for issue 21