Finish fix for #148