fixed stuff loosed on merge