Temporary fix to sig bug