Bugfix - Boolean