bug fix -> getting the right form to use