User: fix #687