Feature #1631: Fix change made for testing