Fix for issue 164