Fixes #416
Fixes #415

Maybe, idk. Seems reasonable.