fixed  company handler bug