Added fix for variable binding issues if model is used persistently.