Implementation of REP 143

I will double check if this is necessary.