Changes to remove warning