bugfix - moving forward