Attempted fix for #277