another try to fix #4318