Refix #652