Fix #2008 for realz this time please!