Replaced #90 with better solution.