Fix issue with removed fucntion