bug fixing - selection back and forth