bug fixed, #24