FIX #1700

Fixes and closes #1700.

cc @agramfort kambysese