tried to further implement unary fix