Temporary fix for #180 until we find a better solution.
Co-authored-by: Daniel Thwaites <danthwaites30@btinternet.com>