FIX #1418 (partially)