Fix bug #618