@shacker this is really painful, is there no way around this?