Attempted fix for issue #33.