Adds work around for delay