Rework #410