small change, fixed small error ready to port to master for now