-final fix :D (so i hope)