Small fix

fixes #1802
fixes #1803
Signed-off-by: Antes <antes@simplemachines.org>