Potential fix for issue 0000055