Fix a bug #564