Selection unit fix