Implemented fix for call