Fix bitmap support