joan commit 1240