Revised previous fix