Fix for ticket #86, thx 2 profi-concept :)