Fixes the conditions