Attempted fix for #15