Important memory issue fixed