Fixing make callback functions