minor bug fix
Merge branch 'Alex'