Dirty fix for #12