Change avoids compatibility issues with Active Record