fixes #2218

Signed-off-by: Antes <antes@simplemachines.org>
Merge pull request #2232 from Antes/general_fix

fixes #2218