Fix for issue 163