Adds back previous fix