these also suffered from issue #307