fixes #2540

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

fixes #2540