Minor memory issue fix