fix for Issue 283