Fixed elusive bug