Try to fix #2.