fixed combinable bugs