Hacky fix for #1.