fix for https://github.com/SerpicoProject/Serpico/issues/596, https://github.com/SerpicoProject/Serpico/issues/399
fix for https://github.com/SerpicoProject/Serpico/issues/596, https://github.com/SerpicoProject/Serpico/issues/399

MooseDojo/Serpico,MooseDojo/Serpico,MooseDojo/Serpico