* memory issue fix