Fixed erroneous partial functions #12