Fixed collision bug (dirty but the only correct way)