[gm #18] merge the fixed bugs