fixed issue with multiple clicks showing false 'current'