handled cases to remove warnings