Fix for #373
Fix for #374

Signed-off-by: Antes <antes@simplemachines.org>
Thanks Norv
Signed-off-by: Antes <antes@simplemachines.org>
Merge pull request #375 from Antes/fixes

Fixes #373 & #374