Fixed issue with closures in AndType (#81, #85)