Fix bug #502