fixed issue54