Fix half of #99