Some bug fixing. Need to fix the crashing issue with 'MyPantry'