Fix for normal mode didn't really fix what it needed... reverting