Fix #9 for 35b2