minor fix
merge with master