[fixes #52392535] Hardcoded true
[#52392535] Cleaned up a bit

The code is still ugly here though.
Merge pull request #767 from JamesGlover/52392535_s2_samples_are_causing_issues

52392535 s2 samples are causing issues