Fix for issue 30