Fix Version

and bugfix