fixed remarks made in #367

see a0b414a