CODE: Slightly more efficient version of previous fix