Prevent Long time problems