Fixed issues 21 and 22.