Fixed bug with condition tracking - hacky