#2409: Updated based on feedback by @narfbg;