Code fix for #17