attempt to fix #12