Issue #1: Fix bug causing safari to reload page