Fix for error in merge from trunk