Yes, this needs to be fixed!