Bug fix of handling fee