bugfix of 8c37582