Fixes bugs introduced by 675c5a5e12f5c5efe59a0d0b30b17a41a398c74e.
Co-authored-by: Ryan <fauxpark@gmail.com>