Make sure Norbert's bug doesn't happen again