Fix another instance where #335 could be exposed