#2 Fix for double selects bug