Fixed version #179