Fix for [üle+jäänud] and similar