added fix for #24