Fix candidate for #347