Fixes conditional