Hope this fixes it in master