Fix for Issue 171