Bug fix + ©