Fixed soon to be resolved regression