temporary fix for next/prev