Boolean attributes issue fix