fix for number and boolean