Fix from Git merge