bugfix (uservoice issue)