fixed a bug with last commit