bugfix first commit