Make things make sense
This commit for @PlashingVole