Minor bug fix
Merge branch 'gredits'