fix #22 correctly!