Fixed for latest base16vim