Fixed a bug introduced by moving things around and then bypassing the code completely (for now)