commit by elvis
bug fixed