fixed issue #357 & #358