Hack to deal with case issue