Hack to always add bundle as second to last