correct teacup handling