Reverted code to remove warning