Fixed media picker. Fixes #35