Bug fix and added static calling