fix issue #27