fixed for amazon server