[BUGFIX] First working version