Improvements to #456 and #455