Attempt at little less dirty fix to get release to work again