FIX move problems