Fixed version for real this time