Updated version with small fix