Fixes issue we had with 1.5.1-dev builds