Partial fix for negation bug