Fix for issue 44