[WIP] small workaround