Fix beacon/arrow bug