An approach to fix issue #19