FIX: Fix for corner case

Ready for review/merge @mluessi @agramfort.

Closes #1483.