Fix #508