Dep fix to stop everything going pear shaped