Hopefully I fixed the SNAFU