[unworking commit] bug fixed