Fixed previous fix

Same as previous