small fix
Merge commit 'bae6a99'