Proporsal to fix FIFO-61 :)