fixed maxim's code
fixed the conflict