To fix #317