Hopefully this merge will fix problems