Until the issue is fixed, this will do for now...