Fixed #1 for Nick.