Possible fix for 1220468