first commit bug fixed