Once is not enough #2

See #1