another commit related to issue #144