temporary fix for previous / next bug