#290 performed the changes requested