SPARK-1729. Fixing import order