NO-99: Fix for last commit.