APOLLO-1521 Possible fix for boolean casts failing