Fixed picker issue #7