Add option to disable cyclic behaviour