#45 another bug fix