Add workaround for bug occuring in latest compiler