New attempt to fix #12