Make this a flag as suggested by erikstmartin