Fixed condition for #4595