implementing fix