Added condition, appears to be working.