Bug Fix for EE 2.6.1