Fixed issues 28 and 29.