No fun allowed.
Fixes some hilarious stool glitches.
Compile fix.
Fixes #3017
Looks like will have to put speshul check back...
Merge pull request #3015 from comma/master

Fix