really fixing the bug supposedly fixed in previous commit (cherry picking from commit 43c2c7060efe57f1cd5c5af0f3eabba894120914)
really fixing the bug supposedly fixed in previous commit (cherry picking from commit 43c2c7060efe57f1cd5c5af0f3eabba894120914)

jamoma/JamomaCore,jamoma/JamomaCore,eriser/JamomaCore,eriser/JamomaCore,jamoma/JamomaCore,eriser/JamomaCore,jamoma/JamomaCore,eriser/JamomaCore,eriser/JamomaCore,jamoma/JamomaCore,eriser/JamomaCore,jamoma/JamomaCore,eriser/JamomaCore,eriser/JamomaCore,jamoma/JamomaCore