Fix allowed type
Merge branch 'sonata/master'