I kind of hate myself for doing this but it's an improvement for #97