Fixed version to match to current scheme