Fix/not working only if