Addrom bypass (8/19)

Addrom bypass