fix for Issue 46