attempted fix at trac 731