Initial fix of issue 192
Cleaned up after fix of issue 192