Company bug fix