Preparation to fix #321