Bug1208974

Fix for bug#1208974