fix until #2277 is done