Be a bit less hacky.