Workaround primus issues