I'm not 100% positive that this is the best fix. Though i can't come up
with a better one for the moment.

Task-Nr: 256251