Really fixing issue #689 this time... I hope