Fixed picker bug