Minor bug re-fixing

Almost distributable.