fixed after bugs.