--fixes for hr-363 feedback