Attempted fix for #23