Fix #261 short freeze problem