previous commit bugs fixed