bug fix, #23