Use a hacky solution to remove timeout issues of #65