Fixed the last issue that I forgot about in my previous commit