Truly fixes #23, :sheep: :facepunch: