#7 Minor bug fixing