Monkey style possible fix for Issue #270