Change suggested by Maciej during code review.