Reviewed and fixed. BUG #1027506