Ugly/hacky fix for #88