Better solution to issue #26