Fix for #24