fix original pull request issue wihtout breaking tests and changing unecessary method signatures