Preparing to fix #12