Corrected to remove warnings