Move picker hack to Utils static method