Fix subject bug #12