Fixed Memory Leak
Work in progress