fix wrong logic again