Little cheat to make it work for new cases and old (from Bosun)