Fixed #2598
also fixed a derp in CE's office