2nd attempt to fix #161