Merge "Fix for bug 24."