added a hack for server submission