Dirty fix for #291