Implementing tagged's fix for @reply issue