Fix #501