Fixed issues with 18 and 67