Fixes #1395
Tweak for #1394