Fixed issues 12 and 14