Fix #476, no sooner said than done