#79 Fix bug