Not sure why I added this without condition...  I'll do some refactoring and see if I can clean things up a bit.