Tested a fixed to run on AWS.