Bug Fix for Popup View