Work around attempt III