Ok, bug fix for #30.