BUG FIX: Unecessary Java Script Execution