Fix to selected forms bug