Finish fix for # 149