STTZ-Fix & Remix by @dampferbug