Fixed 'em for real this time