refactor #485