quick loop fix and fix for firefox