Previous commit now successfully tested and fixed