Attempted fix to #2