Mantle #252 fix