Fix #182 #183 #184