ticket:5 fix to getbarista (original make)