Fix for missing conditions