fix towards #4