First tentative fir for issue WMS-95