Fixed canteen functionality