Fixed bug that was caused by the use of RestClient which was timing out