Fix for broken bounds test