Fix #485