Fixing Issue #91. Does this work for you?