fixed part of google issue #482 part 4