Next Button Bug Fix