bug fixed attempt