Attempted fix for #8