fix bug 50
re fix bug 49
rere fix bug 49