Merging yet again - fix