added return. bug fix