Fix #485.
Fix #482