Fix bug #1361