Fix for Bug# 2428