Merged and fixed