Fixed retag issue. #489