Bit less buggi version