Fixing current conditions bugs