Fixed staggin bugs in develop branch