bug fixes on v1.7f