fix issue #549