#1276 Fix to 008848e4f5bf406761cd1cc024e7bdcb6cdcb916