Add a workaround to prevent the delay, see #8