updated to prevent warnings