Fixed notification/command ordering.