Fixed callback hadnling