Fix with merging from master