Neo Bug

Ref: IOC-058