fix issue#547