#178 implemented as agreed