Fixed issues 11 & 21.