Oops, now really fixed #11