fix2

continue of previous fix