Personal fix for an annoying exception