Patch for tasty feuerbach/tasty#22