fix bugging