Fix 460 2

Squashed #462