Bug# 2428
Fixes for bug fix for 2428. Still has a small bug.