Updated to remove warning