fixing typo
merge from develop