fix #12, for real (hopefully).