Fixed incompatibility with lambda.r functions