Fix for bz1084782