Changed this to prevent errors