fix that logic