bug fixed commit #608edf3