Updated to work with false values.