fix up the nick before action fix. this should be more efficient (plus it is prettier)