#6 Minor bugfix