Fixed issue with boolean and defaults