fix dirty object graph
remove redundant conditional