Oops, fixed #219 again