Fixing merge from master