957049 - Fixing problems due to bubbling