Fix for issue 45