Fixed a big bug! Thank you Frank!