Fixed selection of implementation