fix #4228 a bit more