Corrected bug in Unit and Filter last step