Another fix for part of #99