fixed escape issue and incorrect lambda