Fix bug #1053