Fixed issue with boolean field