Port bagfix to new system