@patrickallaert Changed the approach in b587959