pizza-73: hotfix applied

hotfix for ticket pizza-73. please review.