Fix roundup (backporting)