Fixes #1361 - Maybe I'm missing something?