Memory Lick Bug fix