Adds more robust fix based on block numbers.

Adds more robust fix based on block numbers. #545