Fixed unary logic in app compatibility reasons