Fix #426, no sooner said than done