Fix proposed in #329
Fix proposed in #329