Trace of #181 back in again