Hot fix + map to dynamic buffer