Fixed missed logics