bug fix and added lambda-list-variables