FIX: issue #379 (WITH misses #import)