Ugly, but necessary fix for #18 (at least for now)