add some temporary hacks to support our design