fix conditional
fixin things