refix #1239