final version bug resolved