updated pagination issue - #16