get rid of hardcoded version + little bugfix