Completing fix to #438